merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 21 Oct 2011 06:45:30 +0000 (15:45 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 21 Oct 2011 06:45:30 +0000 (15:45 +0900)
commita6faa3c208aced45b331bad3dc08b22ed0839219
tree9779c50dd84d8dca2b3eab0bcf383d6dcb74cd5a
parent1d36acf5a190fb70d4ea28fa1bb802938c4449c0
parent0096b5aa377bee818ec6e7ef55e8c0f7739f4b7b
merge trunk